Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 27 Jan 2012 20:23:37 +0000 (12:23 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 27 Jan 2012 20:23:37 +0000 (12:23 -0800)
commitdeb47ca515966f563e6993d0490a0298cd1cc698
tree6ac1876dd7d144ea422cd6140091cd80de48dd38
parent672dd306ec4be64f47f30ee3ed4b5ed0467ac334
parentec43c5b43a62dc7362a850ace50a6e8da07214b0
Merge from trunk.